bitkeeper revision 1.188 (3ead27718TdgjbqnWkDXICxGwmRyPg)

Merge boulderdash.cl.cam.ac.uk:/auto/groups/xeno/BK/xeno.bk
into boulderdash.cl.cam.ac.uk:/auto/anfs/scratch/boulderdash/ach61/xeno/xeno.bk

diff --cc .rootkeys
index 072889bf7b873e8b38d25e27ab3fba13149037b3,086d7f083e4cac48190765be22b71ebcc132cd87..dc3adb8bff2f9398a6201104f3a622ca33102b0d
--- 1/.rootkeys
--- 2/.rootkeys
+++ b/.rootkeys
@@@ -411,8 -398,10 +412,11 @@@
  3e5a4e66U45cAIoHmxg0y1e1XhzVCA xenolinux-2.4.21-pre4-sparse/arch/xeno/mm/mmu_context.c
  3e5a4e66qRlSTcjafidMB6ulECADvg xenolinux-2.4.21-pre4-sparse/arch/xeno/vmlinux.lds
  3e5a4e668yELUdtr3HiJZBIqxqUyuA xenolinux-2.4.21-pre4-sparse/drivers/block/Config.in
 +3ea53c6em6uzVHSiGqrbbAVofyRY_g xenolinux-2.4.21-pre4-sparse/drivers/block/genhd.c
  3e5a4e66mrtlmV75L1tjKDg8RaM5gA xenolinux-2.4.21-pre4-sparse/drivers/block/ll_rw_blk.c
+ 3ead095dEkj9JJWYYBnbvW3OYbKFxg xenolinux-2.4.21-pre4-sparse/drivers/char/Config.in
+ 3ead095d00j61GCBaYdu_SwmY-vdSQ xenolinux-2.4.21-pre4-sparse/drivers/char/Makefile
+ 3ead095dPseRoFELVf_xcnVXjq02hw xenolinux-2.4.21-pre4-sparse/drivers/char/dummy_console.c
  3e5a4e66rw65CxyolW9PKz4GG42RcA xenolinux-2.4.21-pre4-sparse/drivers/char/tty_io.c
  3e5a4e669uzIE54VwucPYtGwXLAbzA xenolinux-2.4.21-pre4-sparse/fs/exec.c
  3e5a4e66wbeCpsJgVf_U8Jde-CNcsA xenolinux-2.4.21-pre4-sparse/include/asm-xeno/bugs.h

diff --cc BitKeeper/etc/logging_ok
index 2b628cfdce384ee226f3011b21c1c5c200cbecfc,2b628cfdce384ee226f3011b21c1c5c200cbecfc..0ab3c23f8b7697c56beeca8b6fa295723a1f958a
--- 1/BitKeeper/etc/logging_ok
--- 2/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@@ -1,3 -1,3 +1,4 @@@
++ach61@boulderdash.cl.cam.ac.uk
  ach61@labyrinth.cl.cam.ac.uk
  akw27@boulderdash.cl.cam.ac.uk
  akw27@labyrinth.cl.cam.ac.uk

diff --cc xen/include/xeno/sched.h
Simple merge

diff --cc xenolinux-2.4.21-pre4-sparse/arch/xeno/drivers/block/xl_block.c
Simple merge

diff --cc xenolinux-2.4.21-pre4-sparse/arch/xeno/drivers/block/xl_block.h
Simple merge

diff --cc xenolinux-2.4.21-pre4-sparse/arch/xeno/drivers/block/xl_segment.c
Simple merge